Ffd

Update wangda's branch using Michael's branch