more changes after tweaking routes