updates to cs318 Project