Changes for Tim's final testing, no conflicts