Update with work-in-progress (before fork to Redeem)