committing to branch3.

reviewed branch 3