Improved db, improved listen (to be changed)