Seems to be working with new db system!