Control Improvments