More work on the presentation...