Improvements to look-around
Improvements to look-around