Small T-Rex changes
Merge branch 'jon' into sprint6