Stable and now working on highlighting