Updated accessibility code