Raphael Willis lock-upgrade1620