Expanded DB, modified version