Latest changes for versions stripping