Moved raster into master using new driver