removed unused code and changed to access _highlighted instead of highlighted