Completing synchronization

This last modification enables synchronization, closes #1