Display logic for change of "plan to go back" boolean
Merge remote-tracking branch 'origin/master'