Added wait for light