Changed this block a bit.