Merged in refactor