tech Debt: fixed ordering