v2 - added comments