Cleaned up 2 way data sync