Feature/availability reol 36