SN-28 Refactor