Removed X & Y for performance