shape option added