Draft:Availability revamp