2.17 surfire modified to 2.11