moved to demo client