remove default order
reintegrate order and fix some stuff