Update for latest teamlucc code.