Revision of Summer 2016 Prototype