Unkludged the code a bit.