Updated Pam's compat