update & damage calculations added