Added 'square' orientation