added support for X and Y