Editing code from school :D