Faster updating (18/22)

Faster updating