Fixed relationships
Merge remote-tracking branch 'origin/Emma' into Patrick