final changes before Sep 28 demo by Larsson