Some changes on presentation