Refactor, make it more robust to release
Better way to handles version
Disable