Prototype 2

Pre-custom adapter version