Numerous modifications