Point handling changes