added Yuns comments