Expense logics redesigned