highlighting fine tuning
refactor to allow duplicate entries finished