added Tim's updates