made more database-like