New version init
Improvements