cleanup, ADD_COND + SUB_COND for testing performance
merge