updates to prototype 2