Numerous changes