Feature/availability reol 36

Is this comment still relevant?