Overdue commit with new functions