Availability checking updates and re-work