updates to models and views