Added Euans changes. Improved results.