commit before merge JHargrave