resolved arrow mark issue and timeout issue