rearranged 1.5.2s code layout