GH254 - added some comments