Refactored to next version. Simplified.