Changed to prototype design