Removed parameters from previous refactoring
And created placeholder for highlighting function