Improve manual control