added some syncing features