acceptance testing in progress. different kind of fixes