Removed active wait
More changes