more work on new demo design