Edmundo Chow lock-upgrade9297