Better returns to self + move last point