Updated to match new controls