Assignment 2 refined