Few final changes