Added wait seconds check