updated for model changes