Updated speaking to have upcoming and history