Done all extra credits for Assignment 6