added some more refinements