Final

Final modification for course project.