almost finished lab3 changes