Added diagonal wavefront search