updates for assignment 2. Now meets requirements