Improved performance :-)