completely rearranged modular