Updated Availability Criteria

Closes #10