Added Cal Poly requested changes