Updating with match checking. Hopefully.