adding some refinements