altered database side for future use with fuse