Reorganized for assignment 2