Last Refactor Before Collation