THEMA 4 some changes for a better overview