merged in Ron/Dons latest changes