Changes for Tim's final testing