Bit more work on the presentation