temperary commit so that I can switch back to master.

This commit is not working yet -- I am getting all kinds of
mismatching function calls after I merge with the codes from
gitHub. I think I am just going to switch back to master
branch and start from strach.