AIPRM needs a little modification