one more base structure commit