Redo the prototypes