Gave more standard structure.