updaate from fandy

update