Some improvements for syncronize