updated with Eliot's relationship changes