fixed zp problems, should work as expected now