Improve Oviyam for slow connection