-Reviewed the logic when mode == Away