Updated everything for presentation 2