Updated Prototype