now without manual tuning (but needs bleeding edge snapshots :) )