Version with correct delay