additional relation changes + better logic