Changed the structure a bit.