nice!
sorry for my bad english. i'll try to explain.
when you switch from movement mode to push mode (or whatever you call it) a ring sounds. but if you bring back to movement mode there's no sound so is a bit dificult to know in which state are you. if you implement #1 probably this is not so...