Changed a few things regarding lightning