trying to adapt to new database changes
trying to adapt to new database changes