more changes for lab 2