Added a comment and a better wait when setting time