Additional changes to the prototype