Removed dependency on X, Y in the master code