Revamp the demo. WSSH no longer required