Some changes to output. Need to change to search the up to date database