Completed  functions for programming assignment 2