Dec 17 changes