Updates by M.W. Watermark