Final change by adding update-only too