updated to prototype's version