unic commit
more changes from unix