modified for fraser 6.1.0 release