updated to keep with database names