updated to check current route too