added up_down and wait (not working)