changed model and controller logic for new assoc's