added suport for new version
solved merge conflicts