Refactored mutation. Added badge highlighting for highlights