Optimized persisting Order and did it the right way :)