fixed all. Many versions tbe tested