some more improvement / test