Rearranged helpers