Added debug versions