Added changes from 10/19Z