Merged in my local file for assignment 3