Calm down with the modes

Modified