Adding in 6 and 7 for gtw