Updates to prototype 2