Improve perf + Improve Sync