Various changes, code now inoperable