Migrating to spark