Improved figures