Added Jonathons changes back in