Added ability to take in the parameters as specified by the program guidelines