New sync functionality
Bugfix on last commit