updated for zpm changes