model and frontend changes