Updated references to database, need to put items in synchronous mode

Test and synchronize, test and synchronize