add changes to lab17, lab13, lab05