change the structure a bit