working on fixed match flux