Adaptions in simulator beacuse of new structures.