improved demo database