Firmed up the initialization of modes