compacted damage() and removed unneccessary tests