Several improvement