Full Refactor (nt)