slightly modify so they actually run on AWS