updates to include scaling by luminosity