Adding grep highlighting and updating f function