Review 2 for EQA-2

2nd Review for EQA-2