merging old changes before database redesign.