Added various code