Completed changes to lab04 files