Some more content fine tuning