last commit before db redesign