rearranged static arrays
merged conflicts