Few final Jonathan changes