Few final touches