i=Brian
i=Nathan
i=Tianzy
i=Wangdi

grant check Wangdi patch; elimination of duplicated code.