Working auto-add-next functionality.