Prototype 2

many changes