Committed again the same changes to with the Nates fixes.