Changing the design, early commit.