Improve Controls