Refactor of section 5 routing