Amanda's Changes minus fixes to slide 12