More unity, small changes