Changes to relations, disabled WiP