More changes to prototype