committing source code with Tim's changes