Updated precompute of x, y as per new axes format