Adam's edits to decrease size of call to DB