::DEBUG  VERSION:: fixing issues in the next release.