Willard Foster lock-upgrade0625