Updated to match PMA+