Add wait except sleep