changed mainly the "Components"