SN-84 Following refactor