Changed variables to x and y