added polarisation support