make some modify
merge with no-ff