correct final version

working ok