Improve control