Revert "Revert "Eric added""

This reverts commit 03e409dfb1583a76f2cd9e68f16e6780a4e82fb3.