Fixed more on presentation
Fixed more on presentation