Added int x (Willard)
Added double y.