final commit of GD - branched to hpml