Changed some of Garrett's stuff to make it more likely to work