Working on ssync

Change-Id: Ie1c9771f1338ea29d15ce75926177e820f6222cf