finished changing over database references