Fix broken commit.
Refactor first round creation to common class.