Latest changes to the refactor.