Added correct x/y locs
Merge remote-tracking branch 'origin/master'