updated model and router