returning to the prototype version