Update on Tim's repository