code fix for moisture, data model update