Updated Spark part