updated (resolved conflict from changes in mous_db_getdata)