Added various new code.