Improving the Expected Improvement Algorithm