Gia Layman lock-upgrade0994