8.7-before
refactor
change unidirectional association to bidirectional