luminosity fix and reordering