Added functions for programming assignment 2