More changes to handleDamage