Re-added improved lights