temp - begin of test improvement