Revise for qplan v7