changes to demo from master