rearranged to everything is in the same order in each section. Will submit as PR to bc