Updated for TF2 on Hydro