more work on a great demo!