Reworked Lightning
Fix Lightning Merge Conflict