Reordering
Jistr slides refactoring