Revert "Revert "new ids""

This reverts commit 645dc50d71ede034cd4ae8b30acce1f90e32972e.