Assignment completed
Some modifications made. Done!