Updates to prototype