updated with database changes: