Modified structure a bit.