Point class modified