Small tweeks to get better results