Adeed 2.3.3 compatibility
Adding highlight events
Minor tweaks
Version 2 pre-final commit
Final V2.0 commit