adjust for new DB structure