Updates to Modes

Updates to Modes