again some adaption on the general architecture