Refactor wheels for recur