4016 - Sync Improvements