changes from Fred