added ATTENTION notes for YZH to fix