some refactoring, board ordering. new migration