Added Some Refinement