improve controls #2