Further work to get this to work with polynome