fixed count for basic infra and added other ones.