1st version of relation rework