#24 enhance visibility