Poor makeup feature execution

Other EPIK issues: