rework PM handler