Updated prototype 2