change to db call only
change to db call only