added almost final versions