Baseline 3

More small changes