Prototype final changes