Updated with classwork