changes to accommodate db stuff