end of rewriteDev branch. merged- version 3.0_dev07_01