org auto-attach - hopefully improving auto-attach polling time