Hopefully added support for Damage and is working correctly...