Finished prototype updates

completed the changes to the prototype