local modification
merge code