Reduce delays in controllers