Among the “three great commentaries” on the Awakening of Mahayana Faith [ AMF ]-those written by Huiyuan, Weonhyo, and Fazang-the least amount of scholarly attention has thus far been allotted to the first of the three. This is unfortunate, because it is a rich and insightful commentary, the arguments of which served as an important basis for much of what was written by the later two scholars. This paper examines the portion of Huiyuan's commentary that attempts to resolve the problems in reconciling the orthodox Yogacara explanation of the two hindrances with the AMF 's explanation of the two hindrances. This paper also shows the extent to which Weonhyo relied on Huiyuan's commentary (and especially Huiyuan's usage of the Srimala-sutra ) to develop his own positions. The final portion of the paper shows how the subtle differences between the two major streams of two hindrance doctrine have often been overlooked by later scholars, resulting in misunderstandings.