This pointer fix
Improvements in geometry changes leading to better performance