New version  - w. fixes