Merged Evan and my code