Added various changes