removed some delays