Added Sync, its still slightly wrong