I have done all the suggestions you pointed out