Added some more sync changes, not working yet