adjusted everything for presentation