Changed prototypeproperties to instance-properties