started rearranging expansion headers