Revert "rolled back to last commit because of failed attempt at route changes"

This reverts commit f9ae07f79ae5a98140e4f3e0ef5161ec2b665d0e.