Improve control scripts