Use before and after functions
Merge branch 'master' of github.com:GeStanley/COMP_5541