Programming Assignment 2 : Updated functions