Offline update (14/28)

Offline update