added application selection checks