now includes flux