[#44] renamed the relation and tidied up the callback