added proper damage handling