Changes by rsiebert [2]