Optimizations II - preventing creating new points at a few places