First working versions
New fixes