Updated to new controls