Made necessary modifications to go along with the .cpp