Reworked a bit.