Upgrade to spark_11