Some lightning improvement. Still not what I want