Added Greg's Changes into the project