Added optional rotate