Made a few changes to the prototype