Updates per Tina's requests