Point calculation improvements