(not) final changes