Imlemented the ability to toggle the annotation

Change-Id: I63a69b58073f8491217a43d8a2acb32c71190ed5