Feature/improved ordering