Reviewer comments + Efficiency upgrade