fixed double Jenna typo
merged simultaneous changes