Should this be changed to the DB?