This is my final commit with a couple of minor changes to make it better