Long overdue commit; first of two today