code review completed for haoxuan changes