updated with summer work and acm/upe scholarship