last commit before db restructuring