Got rid of confusing x ad y values with better names