rearranged to one line