2013-03-07: gregs modifications adopted