Enhance the "compare with shift" and "compare with div"