Updated to use latest code section variables.