Updated prototypes with changes for testing on Monday