roll back with fix

restoring post sprint 4 routing after problem found with id conflict