#26 database change for scope