Made some changes to work on Stampede