Change to use new spark