New version and to easier update each other