More assignment2