added spiral (and moving 1e mask)