some design and one forgotten migration