changed unavailability check