Better path finding