litte changes in en version, merged de version