[NOISSUE]
refactor for MFA potential