Refactored x2