prevaluation update underscore removed
resolving conflicts underscore in prevaluation