updated model and form