Prototype reworked