Chris' Updates for prog2