Tightened up DB