Not working version.
- Changed location to actually contain X and Y.