Changing components
New sync system working!
Merge branch 'core'