waiting time fixed, replaced with callback