update code for yeye to code review