Renamed onBack to ‘back’ and onPush to ‘completion’ throughout