Added Jonathan's code to the project