Added bunch of things which may fix or make worse the problem