Revise for MadPUG