Fixed up Garrett's stuff