Removed some custom highlighting for now