Working on availablity control