Added 6.2 case