added controllers and associations
updated controllers and associations