further DB work