Simple data rearrangement added