ENS: Code Changes