updated relationship to work with rails4