Apply Dave @davelab6 changes