removed loader and added highlighting