better availability signal handling