More initial tweeking