some more adaptions