commit modified regtest
unsuccessful merge with develop branch