add accesibility options
merge conflicts