New more structured code.