Prototype 2 Changes DONE