Added configuration for waiting time and modified BA function.