Putting back to ooici repo and added comments.