changed code (model association)