Work #9.2

x/y change