Synced up Kristen's code with my code