changes from Steve Suway which were actually run on cluster