much improved relation handling