- refactored until to return stats object