rev4 commit
merged