final changes for Rev0