19-12 changes

19-12 changes