rearranged some helpers