Attempt to improve the presentation