updated lab04/assignment2