some more fine tuning