Refactored, again.