Added normal_mode to class methods