added conclusion, took out timeline