Added visibility, and highlighting