modifications to run with PZ