Added wait in init