Refactoring, using common 'compute' api now.