Changed definition of X and Y