more adaptions towards new design