model updated and versions fixed