Jonathan Catlett lock-upgrade2034