Some change on presentation