Updated: Reorder of the elements