refactoring mark to use uow