New round of adaptation to UnlockGateway