Revised using the new DBS util.