adding presentation and reorganizing things