overdue commit lots of changes