change structure a bit