Resolve Assignment 2