Raster and Spiral Scans added