Sync now works with with "wait" as well