Adding Daniels latest Changes (Tsunami Corrections)