Added transpose option