New version (it works) after develop