Changed closures
Merge branch 'master' of github.com:mbojey/COSC310A2