Some more fine tuning