New version integrating all changes