fixed revision problems
fixed revision problems
merge