Modified for lab2