mostly DB and controller changes