(Almost) final update