(fix) fix routing issues--attempted