Added sync on update and remove snippet