updated with database references