copied changes from improved controls