preliminary modification for database-backing