data and frontend changes