Revise Availability

incorporate TDR framework