comments from GPHIB-6 implemented