Merge "Check only what's needed and use threshold"