Various refinements :)