Refactor during change - didn't used to use FromResult