Refactored Tahoe