lab 2 edits + lab3