Revision of Spring 2016 Prototype