moved some routing stuff