redone module to adjust to new DB layout