Added polarization option