First stab at tweaking wdb