revised route models
fixed conflicts