Arrange data correctly

That looks a lot like the following topic: