Fixed calculation, added farpoint calculation