Fix and fine tuning