More tweeking - part 2