fixed routing to take out hardcoded sections
merged conflicts