Changes after CR#2