Made some changes that can help.