Trying to Fix routing issues