Change order of elements per suggestion