Fixed more on presentation