cleaned up criteria manipulation.