More tuning to private class history