DCF Code Cleanup, Working Sync