DB rewrite
changes