reorganize evaluation