re-sync previous changes/fixes