Updated to use cur & only highlight line #