fixing reordering
fixed ordering (tested), all starting to look the same