reduce memory consumption, EDUID-179