UST6: First pass for accessibility (follow tanaguru advices)