still working on database sync