Added Keegan and Phillip's code