updated lab2 with kenny's changes