Improved slightly