updated models and modals