Added lights and other changes