SN-44 Refactor