Updates May 18th

offline updates put into sync