Improved light a bit more