Completed synchronous refactor.