Tweaks to prototype