Lot of improvements with ondamagedealt