doc2480

Mods by doc2480