big update
merged from tuan