added flux control
merging