added forelse in highlight