might be good to expose these two as parameters