Added wait for start