Faster updating (3/22)

Faster updating