A bit more fine tuning