More work on demo 007.