Fixed issue with damaging signals

also, simplified the logic