Changes by rsiebert