rearrange more content a bit to make shorter