Changes for new code.