Changed Constructor Layout