Added the TUHH stuff for 5.2