still changing the structure.