Offline update (19/28)

Offline update