Added correct x/y locs