Implemented #45 selector reordering.