lab4 update, lab5 complete