No longer uses pre-calculated values for X and Y