Refining done according to comments