improve pollymer handling