Fixed Some of the Routing