Added the X and Y suffixes