Improved last point logic. We should simplify it!