Updates by DDV, using 12/28/14 changes