pulled updated model (backend) into front-end branch