Updated enc scheme