changes for before final