Added some code for school work