final version of preddiplom and graphs