Better controlls