updated undergrad solutions