moving some work to services factory