Reworked things a little bit.