change to db call only