Update for Spring 2015 hackathon