Improved performance

X