Added an option to show the indicator; Its off by default