more adaptions to build